extensions-app: Port to AdwShortcutsDialog

GTK's ShortcutsWindow has been deprecated for a while, now libadwaita
added a replacement we can move to.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3788>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1798b876f412a37849f8ffb962e65ff2153549fb..a71fa88c57bd2c5fe2fcccaeee8cb004bae83d11 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -101,7 +101,7 @@ subprojects/extensions-app/js/extensionRow.js
 subprojects/extensions-app/js/extensionsWindow.js
 subprojects/extensions-app/data/ui/extension-row.ui
 subprojects/extensions-app/data/ui/extensions-window.ui
-subprojects/extensions-app/data/ui/help-overlay.ui
+subprojects/extensions-app/data/ui/shortcuts-dialog.ui
 subprojects/extensions-tool/src/command-create.c
 subprojects/extensions-tool/src/command-disable.c
 subprojects/extensions-tool/src/command-enable.c

diff --git a/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in b/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in
index 300959c57f271834912d58bb54179b8e55c14c4a..3aebb99585cbc5479d319e33e96a2cb9f2a2af48 100644 (file)
--- a/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in
+++ b/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in
@@ -8,7 +8,7 @@
     <file preprocess="xml-stripblanks">icons/scalable/actions/settings-symbolic.svg</file>
     <file preprocess="xml-stripblanks">icons/scalable/actions/website-symbolic.svg</file>
 
-    <file alias="gtk/help-overlay.ui">ui/help-overlay.ui</file>
+    <file alias="shortcuts-dialog.ui">ui/shortcuts-dialog.ui</file>
   </gresource>
 
   <gresource prefix="/org/gnome/Extensions">

diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index ee8052aba754df9aec7d3aa6e953344ef9e269db..5931ce4e4040570c1a1c2e09b62225e75b3da13b 100644 (file)
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -4,7 +4,7 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">Keyboard Shortcuts</attribute>
-        <attribute name="action">win.show-help-overlay</attribute>
+        <attribute name="action">app.shortcuts</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">About Extensions</attribute>

diff --git a/subprojects/extensions-app/data/ui/help-overlay.ui b/subprojects/extensions-app/data/ui/help-overlay.ui
deleted file mode 100644 (file)
index d78c802..0000000
--- a/subprojects/extensions-app/data/ui/help-overlay.ui
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkShortcutsWindow" id="help_overlay">
-    <property name="modal">true</property>
-    <child>
-      <object class="GtkShortcutsSection">
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="title" translatable="yes" context="shortcut window">General</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Open Menu</property>
-                <property name="accelerator">F10</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Toggle Search</property>
-                <property name="accelerator">&lt;Control&gt;s</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Show Shortcuts</property>
-                <property name="accelerator">&lt;Control&gt;question</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="title" translatable="yes" context="shortcut window">Quit</property>
-                <property name="accelerator">&lt;Control&gt;q</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

diff --git a/subprojects/extensions-app/data/ui/shortcuts-dialog.ui b/subprojects/extensions-app/data/ui/shortcuts-dialog.ui
new file mode 100644 (file)
index 0000000..f988637
--- /dev/null
+++ b/subprojects/extensions-app/data/ui/shortcuts-dialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="AdwShortcutsDialog" id="shortcuts_dialog">
+    <child>
+      <object class="AdwShortcutsSection">
+        <property name="title" translatable="yes" context="shortcut window">General</property>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes" context="shortcut window">Open Menu</property>
+            <property name="accelerator">F10</property>
+          </object>
+        </child>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes" context="shortcut window">Toggle Search</property>
+            <property name="accelerator">&lt;Control&gt;s</property>
+          </object>
+        </child>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes" context="shortcut window">Show Shortcuts</property>
+            <property name="action-name">app.shortcuts</property>
+          </object>
+        </child>
+        <child>
+          <object class="AdwShortcutsItem">
+            <property name="title" translatable="yes" context="shortcut window">Quit</property>
+            <property name="action-name">app.quit</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>